More merge fixes.
authorJuanma Barranquero <lekktu@gmail.com>
Sun, 31 Oct 2010 18:38:16 +0000 (19:38 +0100)
committerJuanma Barranquero <lekktu@gmail.com>
Sun, 31 Oct 2010 18:38:16 +0000 (19:38 +0100)
commit89fd016fb8f7ede7653bafe9e5bbbc5a31244cd4
tree0ca05249c4151d0ac84340803f3362fe4f3282f9
parentd6d6ef258232d211f16e6ed5b46052d2de26f9b5
More merge fixes.
lisp/ChangeLog
lisp/cedet/ChangeLog